Auto merge of #3657 - Keruspe:rust-1.16.0, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 6 Feb 2017 20:31:45 +0000 (20:31 +0000)
committerbors <bors@rust-lang.org>
Mon, 6 Feb 2017 20:31:45 +0000 (20:31 +0000)
commit0bb804711f87c82aa03af7848dbfc460528b074c
tree4c89f8c615cdc6569f126064adff32c527ea6f92
parentec1e036140f771ec8f62579172f77ebe4738f331
parent4d6f6bab8dc09e87dd0bb2990e71cbf37f7a4b22
Auto merge of #3657 - Keruspe:rust-1.16.0, r=alexcrichton

ensure libressl compatibility

like #3644 but for the rust-1.16.0 branch